Fix PAE Mini-OS build.

Signed-off-by: Grzegorz Milos <gm281@cam.ac.uk>

diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile
index e337f1656d928aa3458809139123b48c1ba1bb30..75427676e50bca2615b46388cd6c0566c85031ba 100644 (file)
--- a/extras/mini-os/Makefile
+++ b/extras/mini-os/Makefile
@@ -4,8 +4,6 @@
 # Makefile and a arch.mk.
 #
 
-pae ?= n
-
 XEN_ROOT = ../..
 include $(XEN_ROOT)/Config.mk
 
@@ -35,6 +33,7 @@ TARGET_ARCH_DIR := arch/$(TARGET_ARCH_FAM)
 export TARGET_ARCH
 export TARGET_ARCH_DIR
 export TARGET_ARCH_FAM
+export XEN_TARGET_X86_PAE 
 
 # This is used for architecture specific links.
 # This can be overwritten from arch specific rules.

diff --git a/extras/mini-os/arch/x86/Makefile b/extras/mini-os/arch/x86/Makefile
index 8e655f1d64372971045698e71e9287b4dd69ed2b..10cb1ff9a16b838dd38948c20d50b48b5273f381 100644 (file)
--- a/extras/mini-os/arch/x86/Makefile
+++ b/extras/mini-os/arch/x86/Makefile
@@ -4,6 +4,7 @@
 #
 
 # include arch.mk has to be before mini-os.mk!
+
 include arch.mk
 include ../../minios.mk
 

diff --git a/extras/mini-os/arch/x86/arch.mk b/extras/mini-os/arch/x86/arch.mk
index 9a7704b49041fd3089b5ef4f47c732228483dc57..bf3350c1508b726fb87df6cd211a24a6b08cd122 100644 (file)
--- a/extras/mini-os/arch/x86/arch.mk
+++ b/extras/mini-os/arch/x86/arch.mk
@@ -9,13 +9,11 @@ ARCH_LDFLAGS := -m elf_i386
 ARCH_ASFLAGS := -m32
 EXTRA_INC += $(TARGET_ARCH_FAM)/$(TARGET_ARCH)
 EXTRA_SRC += arch/$(EXTRA_INC)
-endif
 
-ifeq ($(TARGET_ARCH)$(pae),x86_32y)
-ARCH_CFLAGS  := -DCONFIG_X86_PAE=1
-ARCH_ASFLAGS := -DCONFIG_X86_PAE=1
-EXTRA_INC += $(TARGET_ARCH_FAM)/$(TARGET_ARCH)
-EXTRA_SRC += arch/$(EXTRA_INC)
+ifeq ($(XEN_TARGET_X86_PAE),y)
+ARCH_CFLAGS  += -DCONFIG_X86_PAE=1
+ARCH_ASFLAGS += -DCONFIG_X86_PAE=1
+endif
 endif
 
 ifeq ($(TARGET_ARCH),x86_64)